Skip to content

[release-3.6] Semi-Automated cherry pick of #20017 (was Update go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc to work with v0.61.0)#20043

Merged
ahrtr merged 4 commits intoetcd-io:release-3.6from
dims:automated-cherry-pick-of-#20017-upstream-release-3.6-take-2
May 28, 2025
Merged

Conversation

@dims
Copy link
Contributor

@dims dims commented May 28, 2025 •
edited
Loading

Modified version of #20017 suitable for 3.6 branch.

Do not update to otelgrpc v0.61.0 here, just drop the usage of the deprecated APIs (deprecated earlier but dropped in v0.61.0)

dims added 4 commits May 28, 2025 08:34
@dims
Drop usage of deprecated APIs
1ec53d9 
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
@dims
add a new test for tracing with Stream RPC calls
7078a07 
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
@dims
fix test
dd9f9a9 
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
@dims
refactor to reuse a single harness for both unary and stream tests
5baf45e 
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
@codecov
Copy link

codecov bot commented May 28, 2025 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 68.92%. Comparing base (7b35142) to head (5baf45e).
Report is 5 commits behind head on release-3.6.

Additional details and impacted files
Files with missing lines Coverage Δ
server/etcdserver/api/v3rpc/grpc.go 95.00% <100.00%> (-0.13%) ⬇️

... and 19 files with indirect coverage changes

@@               Coverage Diff               @@
##           release-3.6   #20043      +/-   ##
===============================================
+ Coverage        68.88%   68.92%   +0.03%     
===============================================
  Files              420      420              
  Lines            35613    35612       -1     
===============================================
+ Hits             24531    24544      +13     
+ Misses            9652     9638      -14     
  Partials          1430     1430

Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 7b35142...5baf45e. Read the comment docs.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@dims
Copy link
Contributor Author

dims commented May 28, 2025

/assign @ahrtr

if this lands, happy to do another PR for changelog as well.

ahrtr
ahrtr approved these changes May 28, 2025
View reviewed changes
Copy link
Member

@ahrtr ahrtr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM & thx

cc @fuweid @ivanvc @jmhbnz @serathius

@dims dims changed the title Semi-Automated cherry pick of #20017 upstream release 3.6 ( was Update go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc to v0.61.0 ) Semi-Automated cherry pick of #20017 upstream release 3.6 ( was Update go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc to work with v0.61.0 ) May 28, 2025
This was referenced May 28, 2025
Closed
Merged
@k8s-ci-robot
Copy link

k8s-ci-robot commented May 28, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ahrtr, dims, serathius

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ahrtr ahrtr merged commit 9f19153 into etcd-io:release-3.6 May 28, 2025
28 checks passed
@ivanvc ivanvc mentioned this pull request May 28, 2025
Closed
4 tasks
@ivanvc
Copy link
Member

ivanvc commented May 28, 2025

/retitle [release-3.6] Semi-Automated cherry pick of #20017 (was Update go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc to work with v0.61.0)

@k8s-ci-robot k8s-ci-robot changed the title Semi-Automated cherry pick of #20017 upstream release 3.6 ( was Update go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc to work with v0.61.0 ) [release-3.6] Semi-Automated cherry pick of #20017 (was Update go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc to work with v0.61.0) May 28, 2025
@abdurrehman107 abdurrehman107 mentioned this pull request Jun 2, 2025
Merged
@dims dims mentioned this pull request Jun 11, 2025
Closed
@ivanvc ivanvc mentioned this pull request Jul 6, 2025
Closed
2 tasks
@ivanvc ivanvc mentioned this pull request Feb 11, 2026
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@serathius serathius serathius approved these changes

@ahrtr ahrtr ahrtr approved these changes

Assignees

@ahrtr ahrtr

Labels

approved area/testing size/M

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@dims @k8s-ci-robot @ivanvc @serathius @ahrtr